Manual merge.
authorsmh22@firebug.cl.cam.ac.uk <smh22@firebug.cl.cam.ac.uk>
Wed, 6 Jul 2005 15:38:25 +0000 (15:38 +0000)
committersmh22@firebug.cl.cam.ac.uk <smh22@firebug.cl.cam.ac.uk>
Wed, 6 Jul 2005 15:38:25 +0000 (15:38 +0000)

Trivial merge